Updated version 2017.8 from 'upstream/2017.8'
authorSimon McVittie <smcv@debian.org>
Tue, 18 Jul 2017 21:18:13 +0000 (22:18 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 18 Jul 2017 21:18:13 +0000 (22:18 +0100)
with Debian dir 6a1618383ee98b8232aaba2fc84fecb04f7d41bb


Trivial merge